[XM] Differentiate between VLAN PIFs and normal PIFs in network-show

signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 467b42fda303c39333ac43ba232f0df58da6816a..f1bed2d1950296e9168e422f02a249c04a234a0c 100644 (file)
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -2301,11 +2301,19 @@ def xm_network_show(args):
             else:
                 vif = '' 
 
+            if pif:
+                if int(pif['VLAN']) > -1:
+                    pif = '%s.%s' % (pif['device'], pif['VLAN'])
+                else:
+                    pif = pif['device']
+            else:
+                pif = ''
+
             if i == 0:
                 r = {'name_label':network['name_label'],
-                     'vif':vif, 'pif':pif['device']}
+                     'vif':vif, 'pif':pif}
             else:
-                r = {'name_label':'','vif':vif,'pif':pif['device']}
+                r = {'name_label':'', 'vif':vif, 'pif':pif}
 
             print format2 % r